From 3eedeaf182c25bd9dbb7196f0af5860cbdcfba5c Mon Sep 17 00:00:00 2001 From: "Jan D." Date: Sun, 22 Sep 2013 13:07:17 +0200 Subject: [PATCH] * conf_post.h (assume): Fix compiler error: x shall be cond. --- src/ChangeLog | 4 ++++ src/conf_post.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index a5e7c0106a0..7ed8951db14 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2013-09-22 Jan Djärv + + * conf_post.h (assume): Fix compiler error: x shall be cond. + 2013-09-22 Daniel Colascione * xfns.c (x_get_monitor_attributes): Suppress unused variable diff --git a/src/conf_post.h b/src/conf_post.h index 5f6cf0eca37..14af38ce70b 100644 --- a/src/conf_post.h +++ b/src/conf_post.h @@ -253,7 +253,7 @@ extern void _DebPrint (const char *fmt, ...); #if defined lint # define assume(cond) ((cond) ? (void) 0 : abort ()) #elif (__GNUC__ == 4 && __GNUC_MINOR__ >= 5) || __GNUC__ > 4 -# define assume(cond) ((x) || (__builtin_unreachable(), 0)) +# define assume(cond) ((cond) || (__builtin_unreachable(), 0)) #elif defined __MSC_VER # define assume(cond) __assume ((cond)) #else -- 2.30.2